Issue #12094 done. Js and code added from a_small_things plugin