#KT-12381 Fixed (cherry picked from commit 2b87f8e)
#KT-11807 Fixed
Also add some clarification in spec