[-] MO: blocklayered / fix #PNM-1683, #PNM-1684 & #PNM-1687